Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cafce25 and others added 22 commits July 30, 2024 14:55
…sl,ohos}

In issue rust-lang#118053, the `loongarch64-unknown-linux-gnu` target needs indirection
to access external data, and so do the `loongarch64-unknown-linux-musl` and
`loongarch64-unknown-linux-ohos` targets.
llvm/llvm-project#91101 propagates range information across inlining,
resulting in more metadata in this test. Tolerate the range metadata if
it appears.
heuristic was: if it easily allows removing bangs entirely? worth it.
if it requires more effort or just moves the bang? not.
Change orphan hint from "only" to "any uncovered type inside..."

Fix rust-lang#128390
Setting up indirect access to external data for loongarch64-linux-{musl,ohos}

In issue rust-lang#118053, the `loongarch64-unknown-linux-gnu` target needs indirection to access external data, and so do the `loongarch64-unknown-linux-musl` and `loongarch64-unknown-linux-ohos` targets.
…n-compat, r=aDotInTheVoid

rustdoc-JSON: Rename "object safe" to "dyn compatible"

~~Blocked: Sits atop rust-lang#131594. Only the last commit is relevant.~~ (rebased)

Part of rust-lang#130852.

r? aDotInTheVoid or rustdoc
cleanup canonical queries

best reviewed commit by commit. adding `CanonicalQueryInput` to stop returning `defining_opaque_types` in query responses is the most involved change here.

r? ``@compiler-errors``
llvm: Tolerate propagated range metadata

llvm/llvm-project#91101 propagates range information across inlining, resulting in more metadata in this test. Tolerate the range metadata if it appears.

``@rustbot:`` label +llvm-main

r? ``@durin42``

Please wait a moment before approving, putting the llvm-main tag on it to make sure it fixes the integration test.
…e-or, r=jieyouxu

compiler: use `is_none_or` where it is clearly better

heuristic was: if it easily allows removing bangs entirely? worth it. if it requires more effort or just moves the bang? not.
…youxu

extract `expr_assign_expected_bool_error`

moving diagnostics code out of the happy path makes it a lot easier to read imo
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Oct 17, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Oct 17, 2024

📌 Commit c735655 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 17, 2024
@bors
Copy link
Collaborator

bors commented Oct 17, 2024

⌛ Testing commit c735655 with merge 03983fb...

@bors
Copy link
Collaborator

bors commented Oct 17, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 03983fb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 17, 2024
@bors bors merged commit 03983fb into rust-lang:master Oct 17, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 17, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#128391 Change orphan hint from "only" to "any uncovered type insid… 6741b73c4546f006eb65c6ed587d2f71094a492a (link)
#131583 Setting up indirect access to external data for loongarch64… 7e77388fa9c734a0ab6b66bd267c17d743ebdca6 (link)
#131595 rustdoc-JSON: Rename "object safe" to "dyn compatible" 71bd0b7c06b509b8ddc29c568dda472e1046f599 (link)
#131748 cleanup canonical queries 07e00c4922f6a23acd820b1422d623889cc86e70 (link)
#131798 llvm: Tolerate propagated range metadata 85de4d93fc8a7bf6e9d1c4b6d101856106f7fe77 (link)
#131815 compiler: use is_none_or where it is clearly better 7b245461fccef99f468e21da4d8c7e531bd60f0c (link)
#131822 extract expr_assign_expected_bool_error be27d53318b0512fd998b79695382903cbf01ffd (link)

previous master: 06d261daf6

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (03983fb): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -2.9%, secondary -0.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.1% [2.1%, 2.1%] 2
Improvements ✅
(primary)
-2.9% [-3.8%, -1.1%] 3
Improvements ✅
(secondary)
-3.3% [-5.0%, -1.6%] 2
All ❌✅ (primary) -2.9% [-3.8%, -1.1%] 3

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 780.529s -> 781.303s (0.10%)
Artifact size: 333.89 MiB -> 333.79 MiB (-0.03%)

@matthiaskrgr matthiaskrgr deleted the rollup-umncb57 branch January 25, 2025 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants